auto merge of #317 : jdeseno/cargo/doc-manifest-path, r=alexcrichton
authorbors <bors@rust-lang.org>
Mon, 4 Aug 2014 14:59:32 +0000 (14:59 +0000)
committerbors <bors@rust-lang.org>
Mon, 4 Aug 2014 14:59:32 +0000 (14:59 +0000)
commit98bc7730940903c679fbd648531287ce9c207c73
treea03a8a79febadfd0bf3617a086036218c183b410
parent07b9c7028ae920981c4ef866ec9ca4a1bb9c730f
parent83b36cc6d96ab18cc3c5d69b7ee271f1188c67db
auto merge of #317 : jdeseno/cargo/doc-manifest-path, r=alexcrichton